Fix #2212: Avoid imports in the wrong namespace #2225
+43
−29
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.